Improved funcionality, removed redundant files and funcionalities