diff --git a/lib/problem_check.rb b/app/models/problem_check.rb
similarity index 100%
rename from lib/problem_check.rb
rename to app/models/problem_check.rb
diff --git a/lib/problem_check/group_email_credentials.rb b/app/services/problem_check/group_email_credentials.rb
similarity index 100%
rename from lib/problem_check/group_email_credentials.rb
rename to app/services/problem_check/group_email_credentials.rb
diff --git a/lib/problem_check/problem.rb b/app/services/problem_check/problem.rb
similarity index 100%
rename from lib/problem_check/problem.rb
rename to app/services/problem_check/problem.rb
diff --git a/lib/problem_check/twitter_login.rb b/app/services/problem_check/twitter_login.rb
similarity index 100%
rename from lib/problem_check/twitter_login.rb
rename to app/services/problem_check/twitter_login.rb
diff --git a/spec/lib/problem_check_spec.rb b/spec/models/problem_check_spec.rb
similarity index 100%
rename from spec/lib/problem_check_spec.rb
rename to spec/models/problem_check_spec.rb
diff --git a/spec/lib/problem_check/group_email_credentials_spec.rb b/spec/services/problem_check/group_email_credentials_spec.rb
similarity index 100%
rename from spec/lib/problem_check/group_email_credentials_spec.rb
rename to spec/services/problem_check/group_email_credentials_spec.rb
diff --git a/spec/lib/problem_check/twitter_login_spec.rb b/spec/services/problem_check/twitter_login_spec.rb
similarity index 100%
rename from spec/lib/problem_check/twitter_login_spec.rb
rename to spec/services/problem_check/twitter_login_spec.rb