directory restructure
finalized code

along with a directory restructure