Changed file structure

.