Updated with build process for more organized files