Moved files to their own folders and packages