cleaning up everything. reducing some folders to single files