Directory Clean-up

Rearrange directories and files