Updated folder structure and added InitializeContainer to main