Update application structure further. Continue building out components as needed throughout