Added TODO's
Moved test files to test folder