major cleanup and organizing files