Added Testcode and revamped dirs