Refactor and update buildout structure