improved the file layout a little