Changed file structure slightly