Rearrange directories
Updated README