Changed file structure to reflect where actually development takes place