Final changes; rearranging files; commenting etc.