Update application structure further. Continue building out encoder segment etc