New formatting, PHP-Unit, new file structure