rearranged files and modified styling