Cleaned up file structure / Added Taxonomy