More secure project storing

+ cleanup