better files naming and internal naming
conflict solved