restructure dirs, have the code all together