Added base build files; Fixed bugs