Refactored layout of files and set up step 1 to use taxonomies