fixed bug, moved files to correct directory