small tweaks
update file structure to be more flexible