[Refact] separated contorllers in controllers folder
[Fix] Bug in wc selection