Make filenames more consistent
Move extra resources to its own directory