Shared models folder restructure