Removed some weird folder structure