move towards basic file structure
merging changes