Positioning update.
Better file organization AND OTHER CHANGES AS WELL.
More cleanup.