Adjust package structure, adjust field modificators. Attempt to correct CamelCase File names.