Rearrange files

More reasonable and standard directory structure