factored out controllers into features
cleanup layout