Added TODO-list and moved files around