Some refactorings made for better organization.
Some files renamed for consistency.