Added new files and changed some components for testing purposes