Splitted project into modules