Remove bad bycicle implementation.
Move sources to proper directories.
Add factory pattern to util
minor changes