Created helper folder, moved some functionality there