removed development remnants, renamed files for clarity