Remove old files, fix basePath
Start working on tests