Refactored the layout into project and library code