Renamed tasks
Re-structured the test folder
Re-structuring