Refactor: Rearranged files
Refactor: Cleaned up Content directory