Small naming changes and other minor details.
First compilable version of the package.