Moved source int src dir. Removed incomplete compact version - will not be done.