Cleaned up file structure

moved files into sub directory.