Refactored Codebase, added functionallity

extended showcase