Fixed import error started due to file structure changes. Simplified some files as a result of this.