Re-Arrange

Improved folder setup