Added folder structure, removed class files