folder structure finalized. It's a lot simpler now