Temporary commit
Update application structure further