Simplify file structure

Removes unnecessary module definition
Move flags inside main