Reworked file structure for foundation.