Changed file names and restructured