Did some moves of various projects, got tests all working