Code reorganization; committed dummy /src and /test files