Added new file structure build system