Moved to src and simplified.