refactored all cruft from previous iterations, unused files deleted