Reworked file structure for adb3da3

adb3da33d64151815a5dbbd142e3716f2f410991