Clean up filestructure and add some cuke