Updated structure/ removed boundry.cpp/.h