Reorganize directory structure

circular deps with FB until I fix classpath and use

LOCAL_NO_STANDARD_LIBS := true