moved files around to make arduino behave
Completed merge.
added sensor and encoder modules