Refactoring & bugfixes.
Refactor file names & URLs.