refactored parser code a bit
moved swapper into ready folder