moved files and some cleanup