Modules refactor: whenever possible, use modules instead of including files