refactored code and fixed(hopefully) build path