Cleanup. Combined Page and Block into one file. Improved dir structure.