started reworking this old project
restructured modules