Revert "Splitting up files"

This reverts commit 46f5eea4d83325c3788788f82fb624d80a7bee2b.