Move Schema into model module
Clean up bootstrap fn