Tidying up, ignore, move a test file to tests dir, move code to src