Put different classes into different files. Reworked indentations across all files.