Overhaul of organization;  preparing to add better file handling and rendering support