diff --git a/lib/components/TaskTile.dart b/lib/components/TaskTile.dart
index 348e6e2..c49ea45 100644
--- a/lib/components/TaskTile.dart
+++ b/lib/components/TaskTile.dart
@@ -49,7 +49,7 @@ class TaskTileState extends State<TaskTile> {
         trailing: IconButton(
             icon: Icon(Icons.settings),
             onPressed: () {
-              null;
+              null; // TODO: implement edit task
             }),
       );
     }
diff --git a/lib/global.dart b/lib/global.dart
index 622ef19..818d4ac 100644
--- a/lib/global.dart
+++ b/lib/global.dart
@@ -7,7 +7,6 @@ import 'package:vikunja_app/api/task_implementation.dart';
 import 'package:vikunja_app/api/user_implementation.dart';
 import 'package:vikunja_app/managers/user.dart';
 import 'package:vikunja_app/models/user.dart';
-import 'package:vikunja_app/service/mocked_services.dart';
 import 'package:vikunja_app/service/services.dart';
 
 class VikunjaGlobal extends StatefulWidget {
diff --git a/lib/main.dart b/lib/main.dart
index 81393ab..c60fe13 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:vikunja_app/global.dart';
-import 'package:vikunja_app/pages/home_page.dart';
-import 'package:vikunja_app/pages/login_page.dart';
+import 'package:vikunja_app/pages/home.dart';
+import 'package:vikunja_app/pages/user/login.dart';
 import 'package:vikunja_app/theme/theme.dart';
 
 void main() => runApp(VikunjaGlobal(
diff --git a/lib/models/user.dart b/lib/models/user.dart
index ce8fdeb..464d897 100644
--- a/lib/models/user.dart
+++ b/lib/models/user.dart
@@ -1,5 +1,3 @@
-import 'package:meta/meta.dart';
-
 class User {
   final int id;
   final String email, username;
diff --git a/lib/pages/home_page.dart b/lib/pages/home.dart
similarity index 89%
rename from lib/pages/home_page.dart
rename to lib/pages/home.dart
index 55562bb..710d0c4 100644
--- a/lib/pages/home_page.dart
+++ b/lib/pages/home.dart
@@ -3,12 +3,10 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:vikunja_app/components/AddDialog.dart';
 import 'package:vikunja_app/components/GravatarImage.dart';
-import 'package:vikunja_app/fragments/namespace.dart';
-import 'package:vikunja_app/fragments/placeholder.dart';
+import 'package:vikunja_app/pages/namespace/namespace.dart';
+import 'package:vikunja_app/pages/placeholder.dart';
 import 'package:vikunja_app/global.dart';
 import 'package:vikunja_app/models/namespace.dart';
-import 'package:vikunja_app/models/task.dart';
-import 'package:vikunja_app/models/user.dart';
 
 class HomePage extends StatefulWidget {
   @override
@@ -26,9 +24,9 @@ class HomePageState extends State<HomePage> {
 
   _getDrawerItemWidget(int pos) {
     if (pos == -1) {
-      return new PlaceholderFragment();
+      return new PlaceholderPage();
     }
-    return new NamespaceFragment(namespace: _namespaces[pos]);
+    return new NamespacePage(namespace: _namespaces[pos]);
   }
 
   _onSelectItem(int index) {
@@ -51,14 +49,14 @@ class HomePageState extends State<HomePage> {
         .namespaceService
         .create(Namespace(id: null, name: name))
         .then((_) {
-      _updateNamespaces();
+      _loadNamespaces();
       Scaffold.of(context).showSnackBar(SnackBar(
         content: Text('The namespace was created successfully!'),
       ));
     });
   }
 
-  Future<void> _updateNamespaces() {
+  Future<void> _loadNamespaces() {
     return VikunjaGlobal.of(context).namespaceService.getAll().then((result) {
       setState(() {
         _loading = false;
@@ -70,7 +68,7 @@ class HomePageState extends State<HomePage> {
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    _updateNamespaces();
+    _loadNamespaces();
   }
 
   @override
@@ -114,7 +112,7 @@ class HomePageState extends State<HomePage> {
                         children: ListTile.divideTiles(
                                 context: context, tiles: drawerOptions)
                             .toList()),
-                    onRefresh: _updateNamespaces,
+                    onRefresh: _loadNamespaces,
                   )),
         new Align(
           alignment: FractionalOffset.bottomCenter,
diff --git a/lib/pages/list_page.dart b/lib/pages/list/list.dart
similarity index 98%
rename from lib/pages/list_page.dart
rename to lib/pages/list/list.dart
index a99efb9..f0a3a4e 100644
--- a/lib/pages/list_page.dart
+++ b/lib/pages/list/list.dart
@@ -6,7 +6,7 @@ import 'package:vikunja_app/components/TaskTile.dart';
 import 'package:vikunja_app/global.dart';
 import 'package:vikunja_app/models/list.dart';
 import 'package:vikunja_app/models/task.dart';
-import 'package:vikunja_app/pages/list_edit_page.dart';
+import 'package:vikunja_app/pages/list/list_edit.dart';
 
 class ListPage extends StatefulWidget {
   final TaskList taskList;
diff --git a/lib/pages/list_edit_page.dart b/lib/pages/list/list_edit.dart
similarity index 100%
rename from lib/pages/list_edit_page.dart
rename to lib/pages/list/list_edit.dart
diff --git a/lib/fragments/namespace.dart b/lib/pages/namespace/namespace.dart
similarity index 91%
rename from lib/fragments/namespace.dart
rename to lib/pages/namespace/namespace.dart
index 64817c7..b4a7d65 100644
--- a/lib/fragments/namespace.dart
+++ b/lib/pages/namespace/namespace.dart
@@ -6,22 +6,23 @@ import 'package:vikunja_app/components/AddDialog.dart';
 import 'package:vikunja_app/global.dart';
 import 'package:vikunja_app/models/list.dart';
 import 'package:vikunja_app/models/namespace.dart';
-import 'package:vikunja_app/pages/list_page.dart';
+import 'package:vikunja_app/pages/list/list.dart';
 
-class NamespaceFragment extends StatefulWidget {
+class NamespacePage extends StatefulWidget {
   final Namespace namespace;
 
-  NamespaceFragment({this.namespace})
-      : super(key: Key(namespace.id.toString()));
+  NamespacePage({this.namespace}) : super(key: Key(namespace.id.toString()));
 
   @override
-  _NamespaceFragmentState createState() => new _NamespaceFragmentState();
+  _NamespacePageState createState() => new _NamespacePageState();
 }
 
-class _NamespaceFragmentState extends State<NamespaceFragment> {
+class _NamespacePageState extends State<NamespacePage> {
   List<TaskList> _lists = [];
   bool _loading = true;
 
+  /////
+  // This essentially shows the lists.
   @override
   Widget build(BuildContext context) {
     return Scaffold(
diff --git a/lib/fragments/placeholder.dart b/lib/pages/placeholder.dart
similarity index 82%
rename from lib/fragments/placeholder.dart
rename to lib/pages/placeholder.dart
index d203541..2e9f0b6 100644
--- a/lib/fragments/placeholder.dart
+++ b/lib/pages/placeholder.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-class PlaceholderFragment extends StatelessWidget {
+class PlaceholderPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return new Container(
@@ -15,7 +15,7 @@ class PlaceholderFragment extends StatelessWidget {
                 style: Theme.of(context).textTheme.headline,
               ),
             ),
-            new Text('Please select a namespace by clicking the  ☰  icon.',
+            new Text('Please select a namespace by tapping the  ☰  icon.',
                 style: Theme.of(context).textTheme.subhead),
           ],
         ));
diff --git a/lib/pages/login_page.dart b/lib/pages/user/login.dart
similarity index 99%
rename from lib/pages/login_page.dart
rename to lib/pages/user/login.dart
index a7f119d..411d92f 100644
--- a/lib/pages/login_page.dart
+++ b/lib/pages/user/login.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:vikunja_app/global.dart';
-import 'package:vikunja_app/pages/register_page.dart';
+import 'package:vikunja_app/pages/user/register.dart';
 import 'package:vikunja_app/theme/button.dart';
 import 'package:vikunja_app/theme/buttonText.dart';
 import 'package:vikunja_app/theme/constants.dart';
diff --git a/lib/pages/register_page.dart b/lib/pages/user/register.dart
similarity index 100%
rename from lib/pages/register_page.dart
rename to lib/pages/user/register.dart