Cleaned up a bit
Added the test folder