Development

Fixed compilation, removed unneeded files.