Updating structure for tests and README