Basic ship movement + some refactoring