Move stuff from [general container] down into the application layer