refactored all the files into subject folders