Reorganized folders to create seperate class files