Flattened file hierarchy and cleaned everything up