refactored project for test

refactored to try and get libraries working on Gradon's comp