fixing some directory issues, preparing for testing