Refactored folder structure to have core and util component for now, build files changed to be consistent