Cleanded working directory.
Implemented pausing.
Resolved conflict.
Some more code organizing.