Starting refactoring all the file, deleting unwanted ones and fixing refactoring :D
Signed-off-by:thehutch