[Change] Working on directory structure to make for a nicer interface