Added models folder to add serializable types
Small module changes