Renamed test folder to tests, fixed import shite