huge modifications on Markers code; folders organized