#276 - Refactored folder structure and variables to better represent the new upcoming build data model