Structure Change

Organized the folder structure a little better