Restructured Files

Made some changes to file structure for optimized use