This is CUP :D

Just reworking some files