Added request parser and renamed files