Basic Housekeeping

Just moving around the files and creating directory structure