project layou refactoring