Made the 1.5 Structure and moved the test files