Refactored folder and package names.