Reorganized folders into something more sound