removed dist and test modules and pulled tests and source into same project