BROKEN refactor the folders
Make the changes work for the TCP setup
GEt the tests working again as well