Fix makefile and minor typo
Restructure project, prepare upcoming soldering connections