Major file restructure
Changes from remote