refactoring project feature layout