Changed project structure to prepare component