Break modules up into individual files
Refactor