Consolidated files into one shitty directory