Fixed imports and added more folders

Signed-off-by: Jedabero <jedabero@hotmail.com>