Updated folder structure
Updated build system to reflect structural changes