Reorganizad some parts of the project; added search funcionality
More changes
merged master