Renamed some files and modified directory structure