Re-organized buildout to allow for a better validation process.