Better record comments
Restructure the codebase into activities, adapters, models and data