Change samo methods to statick and and add new directory