Initial clean-up (WIP)

Need to solve some unsolved symbols in modules

Signed-off-by: Alec Ari <neotheuser@ymail.com>