refactor file structure
tidy formatting