refactors project files
fixing wiring after refactor
finishes making all functionality working again