More descriptive function names & separate modules. Closes #13