Prepare for generic markup generation.
Renamed main file and did some cleanup.