Changed file into modules