Rearranged ugly file structure