Split into modules and cleaned up file