moved things to src and include
(will clean further later)