Changed files around

Changed file structure