reorganization

Signed-off-by: Tinithraviel <tinithraviel@gmail.com>