Move around some files
Put registering parts into a separate file