restructure of the project & security improvements

#2