Organizing code structure/

Signed-off-by: Amrykid <amrykid@gmail.com>