fixed directory issues(moved files to appropriate dirs)