Reorganized code
Refactored URL schema and views in content