Changed up folder structure, switched to MSTest