Started splitting main file into modules