Simpler organization scheme

No reason for folders