Cleaning [1]

Preparing everything for first showcase