Project refactoring and basic static content