Starting to extract modules. Slight change to naming convention.