Changing the application structure might be worth thinking about, right now the thing might seem quite bloated and randomly thrown together for newcomers.