added a better file structure