restructured file paths
changed file paths again