Refactoring modules into different places for better organization. Better JSON/JSONP handling.