Update application structure and tests further etc