Moved files, added objectives